Merge "EventHub: Prevent duplicate descriptors" am: 27883159 am: 9ea35a91...

Merge "EventHub: Prevent duplicate descriptors" am: 27883159 am: 9ea35a91 am: 0c0639f1 am: 2194db7f

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



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