Merge "EventHub: Prevent duplicate descriptors" am: 27883159d3 am: 9ea35a9163

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2160836

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