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