Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main...

Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main am: 5fd1645f am: 31051a56

Original change: https://android-review.googlesource.com/c/platform/build/+/2960347



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