Merge "Fix session id validation in VirtualDeviceParams.Builder"