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