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