Merge "Adb wifi acquires multicast lock" into main am: 28e63e54

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3509097



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