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

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

Change-Id: I3fc9ca679e22da5d5da1ff2fc1856a5518f02b69