Merge "Use blocklist sub-property in sanitize" am: 40076263a6 am: 26b342a3d2

Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1375332

Change-Id: I4e70692971631008488d33c66fb49f3f3a38d0ca