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

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

Change-Id: I54c7672d1cb6e436dcdcce84c66c40d61ed6c072