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