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

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

Change-Id: Icfd88c34a62f1b4b74f7f7acff8beb9adeca7dc5