Merge "Fix invalid bubble predicate once and for all" into rvc-dev am: 10f788d8e2 am: abfd908097 am: 0397de2c4b

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

Change-Id: I0b15625360433cf1cf498c7c5094bec897732767