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