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

Change-Id: I6ffb8a2ff839ae4b82b5ccfdfb6011800413dfe4