Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I43b14a81c73056c5fad4e51347fb9607cdab34dc
Change-Id: I02868245d886eb0fc1d447c30dbbcdd79157c81f