Merge "[automerger skipped] Merge "Automatically add FEATURE_IPSEC_TUNNELS for...

Merge "[automerger skipped] Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." am: ff22e5f8 am: f85385c8 -s ours am: bd6dd54c -s ours am: 772190af -s ours" into rvc-qpr-dev-plus-aosp am: be83bfea -s ours

am skip reason: Change-Id I9d1a0e9616cdc7089a9bef7c96ff3780de36ed8d with SHA-1 e613309f is in history

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

Change-Id: I793b4e6f6f0dc4cd57f947788990389aca97cddd