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