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