[Manual Merge] Bulk merge missing merge commit shas into main

Bug: b/325548077
Change-Id: I46cd57ebb6a1aa94a91a0bd5a1e3ea16efbb2a1d