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