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