Merge "Fix strict java packages test" am: 3f9fd1e0f7 am: fb268bcb41 am: b2df5de9fb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/IPsec/+/1503111

Change-Id: I2c3106b4d133d80bf62737b03f15e101d70b9968