Merge "Restrict setting platform properties from vendor .prop files" am: c3892c045f
am: 550ebdf9fb

Change-Id: Ie9d551ff1bede431ab562f3fb127254a726e79d3