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