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