Merge "Merge "Fix testMultipleConditions flake" into rvc-dev am: ecb9cfe0 am: 60d328b7" into rvc-d1-dev-plus-aosp am: 697cb845

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

Change-Id: I471da96aacac8ee5792e9011476d378743889546