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

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

Change-Id: I806d6ef56764731373f48b8c14e21932e4276d9a