Merge "Add test case for user quota management in IpSecService" am: cf1a4614e1
am: c9c65317e8

Change-Id: I1022151e9317194ac45501a59f68c9bba89e16df