[automerger skipped] Merge "Merge "Fix interfaceVersion in DhcpServerCallbacks" into qt-r1-dev am: 9a0d576b4d am: bdf173ad92" into qt-qpr1-dev-plus-aosp
am: 071316761a -s ours
am skip reason: change_id I782f479de2d7d4c6579f206645a580c905009d85 with SHA1 c6c1c69378 is in history

Change-Id: I169297e1cc1404a9cf09165b5e9ecf6b7b6a36c3