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