Merge "Revert^2 "Change instance_name argument as webrtc_device_id"" am: 913af34ac3 am: 1c29d15a2d

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

Change-Id: Id3fb023e336106f380e9ca6146f740351f7e882b
Signed-off-by: Automerger Merge Worker <[email protected]>