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