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