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