Merge "When merging tests, prefer non-blocklisted ones." am: 14b71a757b

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

Change-Id: Ie05d4b9349efb392268c3a346aa4cf1df42612c7