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