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