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