Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad3e

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

Change-Id: Idd382f36a1d95246af1daf8cd6e4321277ac99de