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