Merge "Merge changes from topic "networkagent_api" into rvc-dev am: 33accffc am: 32f4a5f9" into rvc-d1-dev-plus-aosp