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

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

Change-Id: If7db6d13300f185415ab2f35f08d02dcb750ef8e