Merge "Always check device policy for device aware permission check and AppOp mode checking" into main