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