Merge "Fix InputDevice listener notification for merged controller." into rvc-qpr-dev am: 72ec8853 am: 02cc1eef

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

Change-Id: I1d0f2001bb7aa7e663fd763bbbe258abe19d49a3