[automerger skipped] Merge "Ensure policy has no absurdly long strings" into sc-dev am: 34ac6bbd24 -s ours

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

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

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