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