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