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

Change-Id: I4da098db8f5513dc172edef0c1b78508124d1243