Merge "Merge "Mark bucket as condition_unknown properly" into rvc-dev am:...

Merge "Merge "Mark bucket as condition_unknown properly" into rvc-dev am: 97d79408 am: 04502832" into rvc-d1-dev-plus-aosp am: e9a24302 am: a448490b

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

Change-Id: If67bdd056a5aa37e8e733cd411a4bafd3cbd5e40