Merge "Use blocklist sub-property in sanitize" am: 2b48a52398

Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/1375199

Change-Id: Ife0296415e231fbff04f9c135fcd073b0fd8a98b