Merge "Convert the Bluetooth NetworkAgent to the @SystemApi way." am: 48e276e223

Change-Id: If06d0b3d905105e5d9eb1321d205a6e3b2a83a18