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