Merge "[automerger skipped] Merge "Ensure policy has no absurdly long strings"...

Merge "[automerger skipped] Merge "Ensure policy has no absurdly long strings" into sc-dev am: 34ac6bbd -s ours am: d8c3a883 -s ours am: ab871aa9 -s ours am: 9d5807a5 -s ours am: 3d1acdf2 -s ours am: 7dc65e93 -s ours" into tm-qpr-dev-plus-aosp am: 507ae96c -s ours

am skip reason: Merged-In Idcf54e408722f164d16bf2f24a00cd1f5b626d23 with SHA-1 12c20150 is already in history

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



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