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

Change-Id: I8a9e70f6924ff2e4e966ea2d59112d1da2081dcf