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