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