Merge "Fix hidl_ssvc_poll thread issues" into oc-dr1-dev am: d8ef90752b
am: 1f9e5b0710  -s ours

Change-Id: I1524b4deb01eda9c6b8644e90be17d26bb8491a1