Merge "Allow blocklisting cfgs." am: 981aea2210

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

Change-Id: I2a9e575fe09f919623298fe462b9d30303e113e5