Merge changes from topic "vpntestToPlatform" into main am: 203c9b929b am: 761c9a29b1

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

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