Merge "Fixed NullPointerException in IpSecService-Netd binder layer"
am: bf74a93eb2

Change-Id: Ia73c6bda7cb265f91648139e15f4bd2668e6c531