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