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

Change-Id: Ia2f09edd205d74fe7d542d17aca353f73e950171