Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad am: 65d9b899 am: bc0df945

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

Change-Id: Ic693fc5e0436c751d0190f8cce890bf838907924