Merge "Check flags for user in SoftRestrictedPermPolicy" into qt-dev am: 674e1600c9
am: 26434bd1b9

Change-Id: Ieb27ed13b61a2f5da758513f080ce73c01472bf8