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