Merge "Property contexts for ro.sanitize.*"