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

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

Change-Id: I24643fae4ea0d0f27cc206fe1cc492c0324fcbdc