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