Merge "Revert "Calculate ro.vendor.api_level with the new vendor API format""...

Merge "Revert "Calculate ro.vendor.api_level with the new vendor API format"" into main am: 367d732f am: 7a4c47e3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2863786



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