Merge official v1.16.0 firmware and resolve conflicts

variants/lilygo_tbeam_1w/target.h

@@ -23,7 +23,4 @@ extern EnvironmentSensorManager sensors;
 SPIClass* getBoardSharedArchiveSPI();
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();