Merge "defconfig: Enable Diag over USB and QPNP power on configurations"