Merge "Ensure policy has no absurdly long strings" into tm-dev am: ddf587b2

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



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