Merge "Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into...

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

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

Change-Id: I55c3a7031d2c86214c6421c2791769f8a3cb850b