Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f7 am: 926a2a40 -s ours" into rvc-qpr-dev-plus-aosp