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