Merge "[conflict] [automerge] Use sp<T>::make to create the sp pointer for EventLoopCallback 2p: a9de1657e9 am: 3081d564cd am: b0302d8c00" into tm-dev am: bfed347796 am: a444326dfc am: 6f7e64030e

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20536681

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