Merge "Use blocklist sub-property in sanitize" am: 1d87df7859 am: 7f229e6523 am: 5e143755b8

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

Change-Id: I3e0b94c130243ca53c91e19338716b59353d3604