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