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

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

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

Change-Id: I37e39260d703baf8591cbfb9ed760b5fc1ab36b5