Merge "On U+ require config_networkWakeupPacketMark/Mask to be 0x80000000" am: c133f6e29c

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

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