Merge changes from topic "webrtc-update-2022" am: 2ffce32f6d am: 629534d0be

Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/2367251

Change-Id: Iabf7d093364d1dbfc0f8abd15f425980d2d91bb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>