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