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