[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 qt-dev am: da63d3e0 am: 32dfdfc4 -s ours am: 8b8e2240 -s ours am: a11ecd6e -s ours am: 347cd30b -s ours am: 3a115083 -s ours

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

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



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