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

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

Change-Id: I9ac2c2fa52d1d46d73a6d5d598d79bce6aea1713