Merge "Fix ConditionUnknown after valid buckets" into rvc-dev am: a78a19b3 am: a695ab18 am: b88358f4

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

Change-Id: Ib671cfc069e4a2f5e14f97acde486e765a789818