Merge "[automerger skipped] Merge "Ensure policy has no absurdly long strings"...

Merge "[automerger skipped] Merge "Ensure policy has no absurdly long strings" into tm-dev am: ddf587b2 am: 449efaa9 -s ours am: e3e6bc10 -s ours am: f60c9b72 -s ours" into udc-dev-plus-aosp am: 27778a69 -s ours

am skip reason: Merged-In Idcf54e408722f164d16bf2f24a00cd1f5b626d23 with SHA-1 5dd3e813 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23031226



Change-Id: Iffbfc6febc4173457b6dc79c024262e9f18b63a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>