Merge "Merge "Use std::shared_ptr in Epoll's callback list. am: 2cf268ab am:...

Merge "Merge "Use std::shared_ptr in Epoll's callback list. am: 2cf268ab am: 81c5a302 am: bbedda71 am: 4905ce50" into sc-qpr1-dev-plus-aosp am: a52759bb" into sc-v2-dev-plus-aosp am: 97e7be6c

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15128087

Change-Id: Ib6101926ad1cf409a71165237a658977c632c16f