Merge remote-tracking branch 'aosp/upstream-main'

Pull in latest upstream for some cross-domain fixes.

Bug: 238663100, 238098098
Test: CTS, ANGLE

Change-Id: I1b5c1abb3654648601d837982ea186d6ccaddb94