Merge "When merging tests, prefer non-blocklisted ones." am: 14b71a757b am: f6d0a0664a am: 8d835765f5 am: 58baa3c20b

Original change: https://android-review.googlesource.com/c/platform/development/+/1768885

Change-Id: Ic34d3dc365729fe64769191833619451f7855265