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