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

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

Change-Id: Idc461718a9e454db6fa9ddde6625749c6f096548