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

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

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