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

Bug: b/325548077
Change-Id: I17edaa5bb5398131c34e51684124564ca3f076eb