[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: 2476af7b -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/+/19967553



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