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