Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17707388 Change-Id: I748241f2dc580bd910c9455ad15821bbdd455a32 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>