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

Change-Id: Ifa49f58660363d78d79eaa3851fe818fb6b75763