Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" am: bc4193971a

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

Change-Id: I8b8a423b093f5a8696e43afbdac0cbb555dd4aff
tree: 868bb8f90b25a84990e77b7132c9833d3ac3af9d
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING