[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 rvc-dev am: 415d288b -s ours am: ddc6b554 -s ours am: 9dea976c -s ours am: 6342dac5 -s ours

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

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



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