Merge "Do not share VirtualDeviceImpl lock with SensorController" into udc-dev