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