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

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

Change-Id: I49c07556b26ec542dac682af18e0089c6feb013c