Merge "Ensure policy has no absurdly long strings" into rvc-dev am: 71e7d412

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



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