[conflict] [automerge] Use sp<T>::make to create the sp pointer for EventLoopCallback 2p: a9de1657e9 am: 3081d564cd am: b0302d8c00

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

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