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