Merge changes I0ab600cd,I1e74c64a am: 798f3afdf6 am: 2f9c4b2c3b am: a9167328fc am: 7563023510

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

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