Merge "Add flag com.android.bluetooth.flags.return_correct_ble_state to trunk_staging." into main