Merge "Allow blocklisting tests." am: 695f93434f

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

Change-Id: I454c64efd4e466278cb2b51e87df7fa8dbe34ba9