Merge "Revert "Revert "Revert "Merge remote-tracking branch 'aosp/upstr..."" into main