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