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