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