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