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