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

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

Change-Id: Ic810748b00b687a962f0f2e4d9a2b82055811b25