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

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

Change-Id: I6c6579015ace87e70a569ac7aab247012f24aeeb