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

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

Change-Id: I1c3cd3061fa834d4da441e329cd939964fa884fa