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