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