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