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