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

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

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