Merge "Add FLAG_PERMISSION_GRANTED_BY_ROLE." into qt-dev am: 9ab1a0daf3
am: 8ef5712f8a

Change-Id: I73d4af2ea02041c88ca1117c39d9943494c2477b