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