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