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