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