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

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

Change-Id: Iebef531a87906407f74db67f7cc90f4f24de6002