Merge changes Ib78afeb2,I29e13367,Icfadfaae am: afcd1cb84b am: 25317ab5d3 am: a6f38ffdc9 am: 457dde521f

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

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