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