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

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

Change-Id: I4591886e2517ac371cbbb8449c68bde1b5b24fa3