Merge "Guard against missing mac addresses in onWakeupEvent" am: 7f589899...

Merge "Guard against missing mac addresses in onWakeupEvent" am: 7f589899 am: 0ddcfde8 am: 5f6d150e am: 6d2b5952

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2566313



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