Merge "Restrict setting platform properties from vendor .prop files"