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