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