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