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

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

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

Change-Id: I3ad0d93a976c7f4dc875e21f337405401164f1c5