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