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