Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams",...

Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel" am: bc545c8a am: 7a52d5a3 am: 1df96ea6

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

Change-Id: If056d1a90cc4dce3882168ca23302fcd086b40ae