Merge "VPN: cancel always-on notification with new id" into oc-dev
am: 4286c5768d

Change-Id: I97138fb1b0418a74de0ea41c191f6b9968ab947c