[automerger skipped] Merge changes from topic "empty-mac-onwakeupEvent" into udc-dev am: 227c350807 -s ours

am skip reason: Merged-In I0b8a03fff6255e067b736f3dbfb53de56420f90b with SHA-1 53e1639b7d is already in history

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

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