Merge "Use blocklist sub-property in sanitize" am: 1d87df7859

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375091

Change-Id: I70207c753089ebdeba82b9041e9aab7cb6501b52