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

Bug: b/325548077
Change-Id: I817da81c4eb6a9a05d6a0f8ed66020d336802287