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

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

Change-Id: If60c151a408c9a53c5c50afbb954f82850e85021