[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-qpr-dev am: 9f4f12be -s ours am: 682623d8 -s ours am: dabc71fd -s ours am: 6905193b -s ours am: 63d17ad7 -s ours am: effa604f -s ours

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

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



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