Merge "Convert the Bluetooth NetworkAgent to the @SystemApi way."