Merge "Make VirtualDeviceImpl#mDeviceId final" into main