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

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

Change-Id: I4375c6b8c398c0169df21e8e35bab1ad6ab04597