[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-qpr1-dev am: b49fc187 -s ours am: 33a43d3c -s ours

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

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



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