Merge changes I7b2bc9fe,I2b2468fc into main

* changes:
  VirtualDeviceManager: Cleanup after PointerChoreogpraher refactor
  InputManagerService: Cleanup after PointerChoreographer refactor