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

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

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