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