[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 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: I5e07711db142a67282c666265961e324447c6ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>