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