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