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