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