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

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

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