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

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

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



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