Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev