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

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

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