Merge "[automerger skipped] Merge "Guard against missing mac addresses in...

Merge "[automerger skipped] Merge "Guard against missing mac addresses in onWakeupEvent" into udc-dev am: 34f6424c am: 77cc078e am: f3a65500 -s ours" into udc-qpr-dev-plus-aosp am: a4467cb1 -s ours

am skip reason: Merged-In Iba20ec1f47b682cfff6127eeade0fdbf912945a6 with SHA-1 4628b5d8 is already in history

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



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