Merge "Add feature flag for replace replace_vpn_profile_store" into main am: 0c11100962

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

Change-Id: If3051bea5217ae5fc7dff4e907ddb7d0cc3fd3a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>