Merge "Update ro.vendor.api_level for non-GRF devices"