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

Change-Id: I56007c9fa5c27bc6429e98891da3ab04b830b26e