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

[automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-v2-dev am: 64a78c7a -s ours am: 2eec3350 -s ours am: 5e3668e2 -s ours am: 055d0cc1 -s ours

am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 2a506d89 is already in history

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



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