Merge changes from topic "wmediumd_pcap" am: cc3b418720 am: 969a745f7a

Original change: https://android-review.googlesource.com/c/platform/external/wmediumd/+/1913471

Change-Id: I174da6e7d013efc868ea0cce3081c269a04d72f4