Merge "Mark bucket as condition_unknown properly" into rvc-dev am: 97d79408 am: 5cda9d0a

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

Change-Id: I6d77e17b5d038528b622944da5e1ad8dd0a31550