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