Merge "Fix style errors for IpSec associated files" am: 58863696db am: 9dfef0cf68

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918643

Change-Id: I353a22e71a3f1778587664ab202d781c7e3dca7c