Merge "Fix the probe wake lock duration when mcast_resolicit is enabled." am: e5a6619db9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1890315

Change-Id: Ic801105c0f3f4784c43054973baa6305c0402d5c