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