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

[automerger skipped] Merge "Ensure policy has no absurdly long strings" into rvc-dev am: 71e7d412 am: bea97203 -s ours

am skip reason: Merged-In Idcf54e408722f164d16bf2f24a00cd1f5b626d23 with SHA-1 12c20150 is already in history

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



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