Merge changes from topic "empty-mac-onwakeupEvent" into udc-dev am: 227c350807 am: 5af9ef6301

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

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