Merge "Fix testMultipleConditions flake" into rvc-dev am: 8d9dc219de

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

Change-Id: I8ed04711ca4450336c8874873cb8b2774af02360
tree: 90b95b7b0d2db5ee5579ca0563dcd18d87d34a13
  1. bin/