Merge "Merge "Fix interfaceVersion in DhcpServerCallbacks" into qt-r1-dev am: 9a0d576b am: bdf173ad" into qt-qpr1-dev-plus-aosp