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

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

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