Merge "Fix AIDL major version number in DeviceInfo3 constructor"