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