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