Merge "Update VirtualDeviceManager.ActivityCallback API" into tm-dev