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

[automerger skipped] Merge "Ensure policy has no absurdly long strings" into sc-dev am: 34ac6bbd -s ours am: d8c3a883 -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/+/23033896



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