Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am: ec996b381d am: 0698972585
am: 434275e33c

Change-Id: Id6dc1070ef538773b4b0dbb1fe9f3a7b4381fac4