Merge "Merge "Use consistent naming for allocating SPI." am: bf48afea am:...

api/current.txt

core/java/android/net/IIpSecService.aidl

core/java/android/net/IpSecManager.java

core/java/android/net/IpSecTransform.java

services/core/java/com/android/server/IpSecService.java

tests/net/java/android/net/IpSecManagerTest.java

...ava/com/android/server/IpSecServiceParameterizedTest.java

tests/net/java/com/android/server/IpSecServiceTest.java