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