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