Merge "Fix ConditionUnknown after valid buckets" into rvc-dev am: a78a19b3 am: a695ab18 am: b88358f4 am: 3bfe47b4

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

Change-Id: I6e91347821704ad7cc2093135c199c094d5e5083