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

Change-Id: If6be09131faf3b9956d6f20971be3b74d0f82f6e