Merge "AppOp mode for device aware permissions should come from their permission states" into main