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: abfd9080 am: 0397de2c am: 96537715

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

Change-Id: I8ed47b3d275d5e0189a2fbf195b0e1fe60e602df