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

[automerger skipped] Merge "Ensure policy has no absurdly long strings" into tm-dev am: ddf587b2 am: 591fdbae -s ours am: f6c8f128 -s ours am: 80c72495 -s ours

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

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



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