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