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

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

Change-Id: I752e958b64f085160638da65841d0f94c30d55b6