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

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

Change-Id: Ib1ba438577754ff4d3dfbdd5918715543f6a55b8