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

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

Change-Id: Ib08c9b560f619d7c04d57df20f4cd7b372a8dc28