[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 tm-dev am: 4d621913 am: 58b4652b -s ours

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

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



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