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