Merge "Fix testMultipleConditions flake" into rvc-dev am: ecb9cfe093

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

Change-Id: Id05a6ba2f99349b857a6d0bfd7066705281aa998