Merge "Add ACTION_VPN_MANAGER_EVENT in ConstantsShim" into tm-dev