[automerger skipped] Merge "Ensure policy has no absurdly long strings" into tm-dev am: ddf587b218 am: 449efaa9d1 -s ours

am skip reason: Merged-In Idcf54e408722f164d16bf2f24a00cd1f5b626d23 with SHA-1 456dbcae5a is already in history

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

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