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 am: add88a5c

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



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