Merge "Uxrestriction Test fix Test: https://android-build.corp.google.com/test_investigate/invocation/I03400010438765605/test/TR72629867145455244/ Bug: 433903059" into main