Merge "Use ro.vendor.api_level for the VSR api level." into main