Merge "Enforce edge-to-edge policy to apps targeting SDK level 35+" into main