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

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

Change-Id: Icf51b0f7f9b40c90ca29708bf71287e2b398f4cf