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