Merge "[automerger skipped] Merge "Limit lengths of fields in Condition to a...

Merge "[automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into tm-dev am: 4d621913 am: 58b4652b -s ours" into tm-d1-dev-plus-aosp am: ee186555 -s ours

am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 14ceb8a5 is already in history

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



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