[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-dev am: 0a898cde -s ours am: 3234273e -s ours

am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 14ceb8a5 is already in history

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



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