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

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

Change-Id: Id83c749892f8556d355be588dce6ac362b3e3375