Merge "Add equals() & hashCode() for VpnProfileState" into tm-dev