Merge "Remove unused import in IpSecAlgorithm" am: d089108eac am: b0afc3231c

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

Change-Id: I5a4d613b76f731ef4b27a404173a251ec63f7d58