Merge "Add odm and oem policies" into qt-dev
am: 9c88c1e93e

Change-Id: I61a3f83f395f2befa4fc4b6e96a4cde962b29875