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