Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad am: 77caef47 am: 65e3c9c3

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

Change-Id: Idda55354dfca93aa891de263c602bff93f55bde9