Merge "Merge "Cosmetic Cleanups for IpSecService" am: 5ade9a228d am: 0bdb9a6e00 am: cc51ef0a47" into oc-mr1-dev-plus-aosp
am: 7261ade5eb

Change-Id: I0624d4df68ba2bd6522da7e3ae14f13b7f2bfbc9