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

Change-Id: I345871c43857d1d0e01377a50e9745ce3c598955