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