Merge "Automatically add FEATURE_IPSEC_TUNNEL_MIGRATION for U/U+ devices." am: 3653fce54c

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

Change-Id: Ifb2807c681e36222f456863b57ef233923ea5694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>