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

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

Change-Id: I51a5272c084b2455817300879f5b637d67bb6e10