Merge "Ensure policy has no absurdly long strings" into udc-dev am: 9e30a4e0 am: 94238bf0

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



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