Merge "Calculate ro.vendor.api_level with the new vendor API format" into main am: 698c6f9035

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

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