Merge cherrypicks of ['googleplex-android-review.googlesource.com/33010623',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33010623', 'googleplex-android-review.googlesource.com/29638539', 'googleplex-android-review.googlesource.com/33752483', 'googleplex-android-review.googlesource.com/33962043', 'googleplex-android-review.googlesource.com/34410821', 'googleplex-android-review.googlesource.com/34411252', 'googleplex-android-review.googlesource.com/34599704', 'googleplex-android-review.googlesource.com/34616475', 'googleplex-android-review.googlesource.com/34391056', 'googleplex-android-review.googlesource.com/34432297', 'googleplex-android-review.googlesource.com/34943748', 'googleplex-android-review.googlesource.com/34938082', 'googleplex-android-review.googlesource.com/35020024', 'googleplex-android-review.googlesource.com/34824569', 'googleplex-android-review.googlesource.com/34442268', 'googleplex-android-review.googlesource.com/34994248', 'googleplex-android-review.googlesource.com/34956292', 'googleplex-android-review.googlesource.com/35157053', 'googleplex-android-review.googlesource.com/35440303', 'googleplex-android-review.googlesource.com/35443119', 'googleplex-android-review.googlesource.com/35085389', 'googleplex-android-review.googlesource.com/35079678', 'googleplex-android-review.googlesource.com/35441276', 'googleplex-android-review.googlesource.com/35463992', 'googleplex-android-review.googlesource.com/35602273', 'googleplex-android-review.googlesource.com/35742619', 'googleplex-android-review.googlesource.com/35499587', 'googleplex-android-review.googlesource.com/35742357', 'googleplex-android-review.googlesource.com/35478809', 'googleplex-android-review.googlesource.com/35774893', 'googleplex-android-review.googlesource.com/35805638', 'googleplex-android-review.googlesource.com/35238265', 'googleplex-android-review.googlesource.com/35902180', 'googleplex-android-review.googlesource.com/35609718', 'googleplex-android-review.googlesource.com/35935373', 'googleplex-android-review.googlesource.com/36026519', 'googleplex-android-review.googlesource.com/36141156', 'googleplex-android-review.googlesource.com/35478392', 'googleplex-android-review.googlesource.com/35440074', 'googleplex-android-review.googlesource.com/36101688', 'googleplex-android-review.googlesource.com/36192053'] into security-aosp-24Q3-release.

Change-Id: I0ef643d7684a5ac551054cd4f555a8f2982c0c09