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