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

[automerger skipped] Merge "Ensure policy has no absurdly long strings" into rvc-dev am: 71e7d412 am: bea97203 -s ours am: 3059d911 -s ours am: 2e68a7c9 -s ours am: 07ec2b74 -s ours am: 01ec7cb9 -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/+/23028641



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