Merge changes I0bb8ac5d,I358a7259

* changes:
  libinputservice: Enable thread safety annotations
  Allow its WindowInfosListener to outlive PointerController