Merge changes I7fd4b6da,Ia36d7944,If7eb7e0e

* changes:
  Modify javadoc for some extra values of VpnManager event
  Add toString() for VpnProfileState
  Move mSessionKey into Ikev2VpnRunner and make it to be a final var