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

[automerger skipped] Merge "Ensure policy has no absurdly long strings" into tm-qpr-dev am: 2286d21f -s ours am: 3c78ba05 -s ours

am skip reason: Merged-In Idcf54e408722f164d16bf2f24a00cd1f5b626d23 with SHA-1 3d8400f5 is already in history

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



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