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