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

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

Change-Id: I59905f40605f4f9ed0cb0d2129534fa41b671cbe