Merge "Fix invalid bubble predicate once and for all" into rvc-dev am:...

Merge "Fix invalid bubble predicate once and for all" into rvc-dev am: 10f788d8 am: 45eb4e4e am: 10b3176a

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

Change-Id: I18e20e887c2ac1c6a6e4b395ccbd093543b12039