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

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

Change-Id: Id6e64519ed71161e8856df6e496ea40ce04d526b