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