Merge "Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am:...
Merge "Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am: ec996b38 am: 07e2d89b" into oc-mr1-dev-plus-aosp
am: c170cb90
Change-Id: If33d937cdfe0a8fdc1289aaf45e5e988a59f10af