Merge changes I55f2bdea,Ic9901bd1 am: d73bdc3bb8

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

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