Merge "Revert "Revert "Calculate ro.vendor.api_level with the new vendo...""...

Merge "Revert "Revert "Calculate ro.vendor.api_level with the new vendo..."" into main am: 053e75b9 am: f587bda8

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



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