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