tree 20c65aa29dbc713ace6d624c0b77490459548542
parent bd841d25d949f4595bd98605a935a2bd160b963d
parent 0577391348d56f1de3dae508f97bf3537b06b6a8
author Hansen Kurli <hkurli@google.com> 1712563715 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1712563715 +0000

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

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

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