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