Merge "[Telephony] Adjust the MobileNetworkActivity's reference" into tm-dev