Merge remote-tracking branch 'aosp/upstream-staging' into merge_main_remove_div_2

Bug: 304217500
Change-Id: I9075433ccdc9da69adb80cfe5d58ef14b7ad16dc