Merge "Revert^2 "Change instance_name argument as webrtc_device_id"" am: 913af34ac3 am: 1c29d15a2d am: 8466356e61 am: 5bdb3c54da am: d77d306c17

Original change: https://android-review.googlesource.com/c/platform/external/openwrt-prebuilts/+/2630469

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