Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED",...

Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev

* changes:
  Send VPN manager event when VPN is deactivated
  Send VPN manager event when VPN always-on status is changed