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